From 8b0c35d95264396628e33f6621dcf6b18d947418 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Tue, 4 May 1993 02:24:42 +0000 Subject: [PATCH] * config.h.in (getenv): Don't test THIS_IS_YMAKEFILE to see if we should exclude the getenv declaration; instead, test NOT_C_CODE. Per suggestion from Francesco Potorti`. * ymakefile (NOT_C_CODE): Define this; it's true, and useful. * config.h.in (volatile): Don't define this to be the empty string if some file has #defined HAVE_VOLATILE. --- src/config.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/config.in b/src/config.in index 8943ca8de34..63577e8cd45 100644 --- a/src/config.in +++ b/src/config.in @@ -199,10 +199,12 @@ and this notice must be preserved on all copies. */ #define SIGTYPE RETSIGTYPE #endif -/* Non-ANSI C compilers don't have volatile. */ +/* Non-ANSI C compilers usually don't have volatile. */ +#ifndef HAVE_VOLATILE #ifndef __STDC__ #define volatile #endif +#endif /* joe@zircon.uucp says that in order to use XFree386, you have to link against -lXbsd, which insists on defining the random @@ -212,10 +214,13 @@ and this notice must be preserved on all copies. */ #define HAVE_RANDOM #endif -#ifndef THIS_IS_YMAKEFILE /* Some of the files of Emacs which are intended for use with other programs assume that if you have a config.h file, you must declare - the type of getenv. */ + the type of getenv. + + This declaration shouldn't appear when alloca.s or ymakfile + includes config.h. */ +#ifndef NOT_C_CODE extern char *getenv (); #endif -- 2.30.2